@elice/material-quiz 1.221217.0 → 1.221228.0

package/cjs/components/material-quiz-edit/options/options-group/OptionGroupAnswerInfo.js

@@ -18,28 +18,21 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 
-const OPTION_CONTENT_WIDTH = 205;
-const OPTION_GROUP_WIDTH = 180;
-const MIN_OPTION_INFO_COUNT = 2;
 const MAX_OPTION_INFO_COUNT = 20;
-const StyledSortableList = styled__default["default"].ul.withConfig({
+const StyledSortableList = styled__default["default"].div.withConfig({
   componentId: "sc-14yoda7-0"
 })(["margin:1rem 0;padding:0;"]);
-const StyledSortableListItemWrapper = styled__default["default"].li.withConfig({
-  componentId: "sc-14yoda7-1"
-})(["display:flex;flex-direction:column;width:100%;&:not(:last-child){margin-bottom:0.5rem;}"]);
 const StyledOptionTitle = styled__default["default"].div.withConfig({
-  componentId: "sc-14yoda7-2"
-})(["display:flex;width:calc(100% - 2rem);"]); //
+  componentId: "sc-14yoda7-1"
+})(["display:flex;width:calc(100% - 2rem - 1.5rem);"]); //
 //
 //
 
-const OptionGroupAnswerList = () => {
+const OptionGroupAnswerInfo = () => {
   const intl = reactIntl.useIntl();
   const {
-    formState,
-    watch,
-    setValue
+    setValue,
+    watch
   } = reactHookForm.useFormContext();
   const {
     append: appendOptionInfoFieldItem,
@@ -49,10 +42,9 @@ const OptionGroupAnswerList = () => {
     keyName: 'id',
     shouldUnregister: true
   });
-  const optionInfoFields = watch('options');
+  const watchedOptions = watch('options');
   const watchedAnswerInfo = watch('answerInfo');
-  const isMinimumOptions = (optionInfoFields === null || optionInfoFields === void 0 ? void 0 : optionInfoFields.length) <= MIN_OPTION_INFO_COUNT;
-  const isMaximumOptions = (optionInfoFields === null || optionInfoFields === void 0 ? void 0 : optionInfoFields.length) >= MAX_OPTION_INFO_COUNT;
+  const isMaximumOptions = (watchedOptions === null || watchedOptions === void 0 ? void 0 : watchedOptions.length) >= MAX_OPTION_INFO_COUNT;
   /**
    *
    */
@@ -69,97 +61,12 @@ const OptionGroupAnswerList = () => {
     const recalculationAnswerList = cloneAnswerList.map(answers => answers.map(answer => answer > index ? answer - 1 : answer));
     removeOptionInfoFieldItem(index);
     setValue('answerInfo', recalculationAnswerList);
-  }; //
-  //
-  //
-
-
-  if (!checkTwoDimensionArray.checkTwoDimensionArray(watchedAnswerInfo)) {
-    return null;
-  }
-
-  return React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement(StyledSortableList, null, optionInfoFields === null || optionInfoFields === void 0 ? void 0 : optionInfoFields.map((option, index) => {
-    var _a, _b, _c, _d;
-
-    const errorMessage = (_d = (_c = (_b = (_a = formState.errors) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b[index]) === null || _c === void 0 ? void 0 : _c.title) === null || _d === void 0 ? void 0 : _d.message;
-    return React__default["default"].createElement(StyledSortableListItemWrapper, {
-      key: option.id
-    }, React__default["default"].createElement(blocks.Flex, {
-      align: "center",
-      width: "100%"
-    }, React__default["default"].createElement(OptionGroupAnswerListItem, {
-      optionId: index
-    }), React__default["default"].createElement(blocks.Hspace, {
-      width: 0.5
-    }), React__default["default"].createElement(blocks.Tooltip, {
-      title: isMinimumOptions ? intl.formatMessage({
-        id: 'answer.option.tooltip.minDisabled'
-      }) : undefined,
-      placement: "top"
-    }, React__default["default"].createElement("span", null, React__default["default"].createElement(blocks.IconButton, {
-      transparent: true,
-      icon: icons.eilMathsignMultiplyBasic,
-      role: "gray6",
-      size: "micro",
-      border: false,
-      disabled: isMinimumOptions,
-      onClick: () => handleRemoveItem(index)
-    })))), errorMessage ? React__default["default"].createElement(blocks.Text, {
-      size: "small",
-      role: "danger"
-    }, errorMessage) : null);
-  })), React__default["default"].createElement(blocks.Tooltip, {
-    title: isMaximumOptions ? intl.formatMessage({
-      id: 'answer.option.tooltip.maxDisabled'
-    }) : undefined,
-    placement: "top"
-  }, React__default["default"].createElement("span", null, React__default["default"].createElement(blocks.Button, {
-    borderDashed: true,
-    block: true,
-    transparent: true,
-    disabled: isMaximumOptions,
-    icon: React__default["default"].createElement(blocks.Icon, {
-      icon: icons.eilMathsignAddBasic
-    }),
-    onClick: () => appendOptionInfoFieldItem({
-      id: randomId.createRandomId(),
-      title: '',
-      content: ''
-    })
-  }, intl.formatMessage({
-    id: 'answer.option.addButton'
-  })))), React__default["default"].createElement(blocks.Vspace, {
-    height: 0.5
-  }), React__default["default"].createElement(blocks.StatusText, {
-    role: "description"
-  }, intl.formatMessage({
-    id: 'answer.option.file.description.imageSize'
-  })), React__default["default"].createElement(blocks.StatusText, {
-    role: "description"
-  }, intl.formatMessage({
-    id: 'answer.option.file.description.fileSize'
-  })), React__default["default"].createElement(blocks.StatusText, {
-    role: "description"
-  }, intl.formatMessage({
-    id: 'answer.option.file.description.extension'
-  })));
-}; //
-//
-//
-
-
-const OptionGroupAnswerInfo = () => {
-  const intl = reactIntl.useIntl();
-  const {
-    setValue,
-    watch
-  } = reactHookForm.useFormContext();
-  const watchedOptions = watch('options');
-  const watchedAnswerInfo = watch('answerInfo');
+  };
   /**
    *
    */
 
+
   const onSortEnd = ({
     oldIndex,
     newIndex
@@ -175,38 +82,107 @@ const OptionGroupAnswerInfo = () => {
     setValue('options', reactSortableHoc.arrayMove(watchedOptions, oldIndex, newIndex), {
       shouldDirty: true
     });
+  };
+  /**
+   *
+   */
+
+
+  const renderAnswerTitle = () => {
+    return React__default["default"].createElement(StyledOptionTitle, null, React__default["default"].createElement(blocks.Flex, {
+      width: "33.3%",
+      auto: true
+    }, React__default["default"].createElement(blocks.Text, {
+      size: "small",
+      bold: true
+    }, intl.formatMessage({
+      id: 'answer.option.title.text'
+    }))), React__default["default"].createElement(blocks.Flex, {
+      width: "33.3%"
+    }, React__default["default"].createElement(blocks.Text, {
+      size: "small",
+      bold: true
+    }, intl.formatMessage({
+      id: 'answer.option.title.file'
+    }))), React__default["default"].createElement(blocks.Flex, {
+      width: "calc(33.3% - 1.5rem)"
+    }, React__default["default"].createElement(blocks.Text, {
+      size: "small",
+      bold: true
+    }, intl.formatMessage({
+      id: 'answer.option.title.group'
+    }))));
+  };
+  /**
+   *
+   */
+
+
+  const renderAnswerOptionList = () => {
+    return React__default["default"].createElement(blocks.SortableListGroup, {
+      onSortEnd: onSortEnd,
+      useDragHandle: true
+    }, React__default["default"].createElement(StyledSortableList, null, watchedOptions === null || watchedOptions === void 0 ? void 0 : watchedOptions.map((option, index) => React__default["default"].createElement(OptionGroupAnswerListItem, {
+      key: option.id,
+      optionId: index,
+      onRemoveItem: () => handleRemoveItem(index)
+    }))));
+  };
+  /**
+   *
+   */
+
+
+  const renderAnswerOptionAddButton = () => {
+    return React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement(blocks.Tooltip, {
+      title: isMaximumOptions ? intl.formatMessage({
+        id: 'answer.option.tooltip.maxDisabled'
+      }) : undefined,
+      placement: "top"
+    }, React__default["default"].createElement("span", null, React__default["default"].createElement(blocks.Button, {
+      borderDashed: true,
+      block: true,
+      transparent: true,
+      disabled: isMaximumOptions,
+      icon: React__default["default"].createElement(blocks.Icon, {
+        icon: icons.eilMathsignAddBasic
+      }),
+      onClick: () => appendOptionInfoFieldItem({
+        id: randomId.createRandomId(),
+        title: '',
+        content: ''
+      })
+    }, intl.formatMessage({
+      id: 'answer.option.addButton'
+    })))), React__default["default"].createElement(blocks.Vspace, {
+      height: 0.5
+    }), React__default["default"].createElement(blocks.Flex, {
+      column: true
+    }, React__default["default"].createElement(blocks.StatusText, {
+      role: "description"
+    }, intl.formatMessage({
+      id: 'answer.option.file.description.imageSize'
+    })), React__default["default"].createElement(blocks.StatusText, {
+      role: "description"
+    }, intl.formatMessage({
+      id: 'answer.option.file.description.fileSize'
+    })), React__default["default"].createElement(blocks.StatusText, {
+      role: "description"
+    }, intl.formatMessage({
+      id: 'answer.option.file.description.extension'
+    }))));
   }; //
   //
   //
 
 
+  if (!checkTwoDimensionArray.checkTwoDimensionArray(watchedAnswerInfo)) {
+    return null;
+  }
+
   return React__default["default"].createElement(blocks.Flex, {
     column: true
-  }, React__default["default"].createElement(StyledOptionTitle, null, React__default["default"].createElement(blocks.Flex, {
-    auto: true
-  }, React__default["default"].createElement(blocks.Text, {
-    size: "small",
-    bold: true
-  }, intl.formatMessage({
-    id: 'answer.option.title.text'
-  }))), React__default["default"].createElement(blocks.Flex, {
-    width: `${OPTION_CONTENT_WIDTH}px`
-  }, React__default["default"].createElement(blocks.Text, {
-    size: "small",
-    bold: true
-  }, intl.formatMessage({
-    id: 'answer.option.title.file'
-  }))), React__default["default"].createElement(blocks.Flex, {
-    width: `${OPTION_GROUP_WIDTH}px`
-  }, React__default["default"].createElement(blocks.Text, {
-    size: "small",
-    bold: true
-  }, intl.formatMessage({
-    id: 'answer.option.title.group'
-  })))), React__default["default"].createElement(blocks.SortableListGroup, {
-    onSortEnd: onSortEnd,
-    useDragHandle: true
-  }, React__default["default"].createElement(OptionGroupAnswerList, null)));
+  }, renderAnswerTitle(), renderAnswerOptionList(), renderAnswerOptionAddButton());
 };
 
 module.exports = OptionGroupAnswerInfo;

package/cjs/components/material-quiz-edit/options/options-group/OptionGroupAnswerListItem.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface OptionGroupAnswerListItemProps {
     optionId: number;
+    onRemoveItem: () => void;
 }
 declare const OptionGroupAnswerListItem: React.FC<OptionGroupAnswerListItemProps>;
 export default OptionGroupAnswerListItem;